diff --git a/Makefile.am b/Makefile.am
index 98a5cd6..f53ac34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ bin_SCRIPTS = startsde openbox-sde
 xsessiondir=$(xsesspath)
 xsession_DATA = SDE.desktop
 
-defaultsdir=$(sysconfdir)/xdg/sde-session-manager/SDE
+defaultsdir=$(sysconfdir)/xdg/lxsession/SDE
 defaults_DATA = autostart desktop.conf
 
 desktopdir=$(datadir)/applications
diff --git a/autostart b/autostart
index 9bee67b..c237b0d 100644
--- a/autostart
+++ b/autostart
@@ -1,4 +1,5 @@
 @waterline --profile SDE
 @stuurman-desktop --profile SDE
 @stuurman -d --profile SDE
+@volumeicon
 @xscreensaver -no-splash
diff --git a/desktop.conf b/desktop.conf
index ef90fdb..09fb0c5 100644
--- a/desktop.conf
+++ b/desktop.conf
@@ -2,14 +2,18 @@
 window_manager=openbox-sde
 
 [GTK]
-sNet/ThemeName=Clearlooks
-sNet/IconThemeName=Faenza
-sGtk/FontName=Play 10
+sNet/ThemeName=Clearlooks
+sNet/IconThemeName=adwaita-xfce
+sGtk/CursorThemeName=Adwaita
+sGtk/FontName=Sans 10
 iGtk/ToolbarStyle=3
 iGtk/ButtonImages=1
 iGtk/MenuImages=1
-iGtk/CursorThemeSize=18
+iGtk/CursorThemeSize=24
 iXft/Antialias=1
+iXft/Hinting=1
+sXft/HintStyle=hintmedium
+sXft/RGBA=rgb
 
 [Mouse]
 AccFactor=20
diff --git a/openbox/rc.xml.in b/openbox/rc.xml.in
index f48eb79..33db616 100644
--- a/openbox/rc.xml.in
+++ b/openbox/rc.xml.in
@@ -61,9 +61,9 @@
       D: omnipresent (on all desktops).
   -->
   <keepBorder>yes</keepBorder>
-  <animateIconify>yes</animateIconify>
+  <animateIconify>no</animateIconify>
   <font place="ActiveWindow">
-    <name>Play</name>
+    <name>Sans</name>
     <size>10</size>
     <!-- font size in points -->
     <weight>Bold</weight>
@@ -72,7 +72,7 @@
     <!-- 'italic' or 'normal' -->
   </font>
   <font place="InactiveWindow">
-    <name>Play</name>
+    <name>Sans</name>
     <size>10</size>
     <!-- font size in points -->
     <weight>Bold</weight>
@@ -81,7 +81,7 @@
     <!-- 'italic' or 'normal' -->
   </font>
   <font place="MenuHeader">
-    <name>Play</name>
+    <name>Sans</name>
     <size>10</size>
     <!-- font size in points -->
     <weight>Bold</weight>
@@ -90,7 +90,7 @@
     <!-- 'italic' or 'normal' -->
   </font>
   <font place="MenuItem">
-    <name>Play</name>
+    <name>Sans</name>
     <size>10</size>
     <!-- font size in points -->
     <weight>Normal</weight>
@@ -99,7 +99,7 @@
     <!-- 'italic' or 'normal' -->
   </font>
   <font place="OnScreenDisplay">
-    <name>Play</name>
+    <name>Sans</name>
     <size>10</size>
     <!-- font size in points -->
     <weight>Bold</weight>
@@ -402,13 +402,13 @@
 
     <mousebind button="Up" action="Click">
       <action name="Shade"/>
-      <action name="FocusToBottom"/>
+      <!-- <action name="FocusToBottom"/>
       <action name="Unfocus"/>
-      <action name="Lower"/>
+      <action name="Lower"/> -->
     </mousebind>
     <mousebind button="Down" action="Click">
       <action name="Unshade"/>
-      <action name="Raise"/>
+      <!-- <action name="Raise"/> -->
     </mousebind>
 
     <mousebind button="Right" action="Press">
diff --git a/sde-lock-screen.desktop.in b/sde-lock-screen.desktop.in
index 1002093..44aa7cf 100644
--- a/sde-lock-screen.desktop.in
+++ b/sde-lock-screen.desktop.in
@@ -3,7 +3,7 @@ Type=Application
 _Name=ScreenLock
 _Comment=Lock your screen
 Icon=system-lock-screen
-Exec=sde-lock-screen
-TryExec=sde-lock-screen
+Exec=xscreensaver-command -lock
+TryExec=xscreensaver-command -lock
 NoDisplay=true
 # FIXME: this file should probably be moved to sde-session-manager
diff --git a/sde-logout.desktop.in b/sde-logout.desktop.in
index 111dcaa..59d9508 100644
--- a/sde-logout.desktop.in
+++ b/sde-logout.desktop.in
@@ -3,7 +3,7 @@ Type=Application
 _Name=Logout
 _Comment=Logout, shutdown or reboot
 Icon=gnome-logout
-Exec=sde-logout
-TryExec=sde-logout
+Exec=lxsession-logout
+TryExec=lxsession-logout
 NoDisplay=true
 # FIXME: this file should probably be moved to sde-session-manager
diff --git a/startsde.in b/startsde.in
index 8e82d2d..f99136b 100755
--- a/startsde.in
+++ b/startsde.in
@@ -56,4 +56,4 @@ check_menu_prefix "lxqt-"
 export XDG_CURRENT_DESKTOP="SDE"
 
 # Start the SDE session
-exec @prefix@/bin/sde-session-manager -s SDE -e SDE
+exec @prefix@/bin/lxsession -s SDE -e SDE
diff --git a/stuurman-desktop/desktop.conf.in b/stuurman-desktop/desktop.conf.in
index 1d5d088..d1e9633 100644
--- a/stuurman-desktop/desktop.conf.in
+++ b/stuurman-desktop/desktop.conf.in
@@ -1,4 +1,4 @@
 [desktop]
-wallpaper=@prefix@/share/sde/wallpapers/philip-kl6zd_FJtUo-unsplash.jpg
-wallpaper_mode=2
+wallpaper=@prefix@/share/sde/wallpapers/lloyd-blunk-mH9Mz6piRoc-unsplash.jpg
+wallpaper_mode=3
 desktop_font=Sans 12
diff --git a/waterline/panels/panel1.js b/waterline/panels/panel1.js
index cf0e898..c5d697b 100644
--- a/waterline/panels/panel1.js
+++ b/waterline/panels/panel1.js
@@ -96,21 +96,10 @@
       "border": 0,
       "icon_size": 0
     },
-    {
-      "settings": {
-        "volume_control_command": "",
-        "alpha_blending_enabled": true
-      },
-      "type": "volumealsa",
-      "expand": false,
-      "padding": 0,
-      "border": 0,
-      "icon_size": 0
-    },
     {
       "settings": {
         "display_in_frame": true,
-        "use_custom_icon_size": true,
+        "use_custom_icon_size": false,
         "icon_size": 16
       },
       "type": "notification_area",
@@ -186,4 +175,4 @@
       "border": 0
     }
   ]
-}
\ No newline at end of file
+}
